From 165e970296cf0fb8e317ce803fb6c8ff0bd31fc3 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Fri, 25 Jan 2002 21:34:18 +0000 Subject: [PATCH] Merge from gdk-pixbuf stable. 2002-01-25 Federico Mena Quintero Merge from gdk-pixbuf stable. * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness conversion --- swap the individual 16 bit values instead of taking everying as a 32 bit value. (rgb565lsb): Likewise. (rgb555lsb): Likewise. (rgb555msb): Likewise. --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gdk/gdkpixbuf-drawable.c | 8 ++++---- 8 files changed, 81 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e352c3df7..0609e6a610 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2002-01-25 Federico Mena Quintero + + Merge from gdk-pixbuf stable. + + * gdk/gdkpixbuf-drawable.c (rgb565msb): Fixed the endianness + conversion --- swap the individual 16 bit values instead of taking + everying as a 32 bit value. + (rgb565lsb): Likewise. + (rgb555lsb): Likewise. + (rgb555msb): Likewise. + 2002-01-25 Alex Larsson * gdk/linux-fb/gdkdrawable-fb2.c (gdk_drawable_impl_fb_class_init): diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c index ce7319acd9..2926b5834d 100644 --- a/gdk/gdkpixbuf-drawable.c +++ b/gdk/gdkpixbuf-drawable.c @@ -437,7 +437,7 @@ rgb565lsb (GdkImage *image, | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10; #else /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0xf800) | (data & 0xe000) >> 5 | (data & 0x7e0) >> 3 | (data & 0x600) >> 9; @@ -534,7 +534,7 @@ rgb565msb (GdkImage *image, register guint32 data; #ifdef LITTLE /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0xf800) >> 8 | (data & 0xe000) >> 13 | (data & 0x7e0) << 5 | (data & 0x600) >> 1; @@ -768,7 +768,7 @@ rgb555lsb (GdkImage *image, | (data & 0x1f0000) >> 5 | (data & 0x1c0000) >> 10; #else /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0x7c00) << 1 | (data & 0x7000) >> 4 | (data & 0x3e0) >> 2 | (data & 0x380) >> 7; @@ -860,7 +860,7 @@ rgb555msb (GdkImage *image, register guint32 data; #ifdef LITTLE /* swap endianness first */ - data = s[0] | s[1] << 8 | s[2] << 16 | s[3] << 24; + data = s[1] | s[0] << 8 | s[3] << 16 | s[2] << 24; s += 4; *o++ = (data & 0x7c00) >> 7 | (data & 0x7000) >> 12 | (data & 0x3e0) << 6 | (data & 0x380) << 1; -- 2.30.2